From a92b1f75781e00971199df3bb0376bcab3b6a031 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sat, 6 Jul 2013 21:00:12 +0000
Subject: [PATCH] Round, don't truncate lowrance coords on write

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4401 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/lowranceusr.cc            |   2 +-
 gpsbabel/reference/enchilada.usr   | Bin 2977 -> 2977 bytes
 gpsbabel/reference/ignoreicons.usr | Bin 2901 -> 2901 bytes
 gpsbabel/reference/lowrance.usr    | Bin 622 -> 622 bytes
 gpsbabel/testo.d/classic-1.test    |  35 ----------------------------
 gpsbabel/testo.d/lowranceusr.test  |  36 +++++++++++++++++++++++++++++
 6 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 gpsbabel/testo.d/lowranceusr.test

diff --git a/gpsbabel/lowranceusr.cc b/gpsbabel/lowranceusr.cc
index 233dbe576..0c1685b5d 100644
--- a/gpsbabel/lowranceusr.cc
+++ b/gpsbabel/lowranceusr.cc
@@ -362,7 +362,7 @@ lon_mm_to_deg(double x)
 static long
 lon_deg_to_mm(double x)
 {
-  return (long)(x * SEMIMINOR * DEGREESTORADIANS);
+  return lround(x * SEMIMINOR * DEGREESTORADIANS);
 }
 
 static double
diff --git a/gpsbabel/reference/enchilada.usr b/gpsbabel/reference/enchilada.usr
index 7df3252975dcc005fcb5a1d462a8b8d3596853b3..3721d42477210882c614b94a54a00cfe3b09c3ec 100644
GIT binary patch
literal 2977
zcma*pduY{V9LMqJoZJ?M^8#%`s0(J2w86CflUs(lW-UYJEp@t1Yq@#0Gd9oA>C9VJ
zI=gu#Z>UHvlqI%WmS&cn6mdkTUH%9S6c=h<$~4sD=l!MUK#bxH4!rjLJ-^@Y`8~hq
z^F1f%oJ-MX@yKF#<W6(ELr&9YT&N*j9hoV))~=GCeTSfc+x>X4yK}oazDxi0(C4YT
zhA>Cke)D63?n{l?7H^JUQ9V_k@zI9LP%Wd{FZfaSxX(2zrW;ac)YBDpk*qxa<1g3l
z*Tb!RqSzhQ{ir2I4dXxlvj3S?np|4f7_H383nuv}$xPC@pu1O>9@SV=lU3Rn34~nl
zAtARwOVz2F2VN0)gaDN<z#O3iM1*!wCF};}!cH(**a3=#4Pcb88Wad`gM48*$Pr!x
z*}@|5fG`ha2vLwOL_msA3*uVaYH(AS0j>(qgWrX5;Ji=*P78(LXJHulK^O|Y69#}z
z;eK#LNC#gFY2Yit0ao;eUR7Y9@F&<STmc^lx50;kowY~k$ypx>{lI5Jf566g5bPIh
z8XOw#D+Pd?7J+YtXTdR{6dV_(`AP*is!A9z*j9|ESU@EvEc1un@|AVqunukUcpq@n
zHo(N}<ucX%RQzVPr|6{ei4L6vZNeF_Q#c2<2wh;ka1p#KTmvn_4X{XvgE>M#VG7g>
zsh~zk2NgmeP$u*P6NUa@ijd_G<${nZ`Cz6{2)NE@P%DfDQDGuz63W10p&T%=8DNz#
z4QvpmgY7~H@RnZ&ymtdTAx!0f&;VGdCXXc^Er3;B4H&!;&|t<?hbsdy<t}EqJI<Pr
zyKexwJ7B9MSnlcsdo|U<f8=hA4q5J=6jpIMxwE%V?%tr1E7-;uEG(o#?wSC(n++1V
zOI5{k=Y(W(_Y9|>(PP?XCU<#M$lb%Bd+yl7=^SEPCUO@iQ-@Uf3$WUM0M`F9;Emh@
ziQG}?#dSz)5OC$c{aIG|pKS7uEStO|n<_8Vng*2-T#%TI2Bge7OfuPIu&pZdY36j&
z`l`Rqo4&FZ5L?S8ux!$fESpT@-`Ql&wp*C0?H{svg6ojY)1XzbY;F~j&L%PGp3Pot
z-IsKzH<&K;1(SqKFhv;T4_P)}R3({gPT;J08f*bvB3LBJrX`VVPG!tS!SYKsU!cN!
zuLSH31G{Awm4iY(=$=iM&a%m>S~eMM*<|n<&Z0Tn7_gKISDp_#gxTO@!TJCTUPWbx
zV2x#yU{660G^`M8&NLsxe8C=v9%zdY7M|leRYDP94Xv$}3$~bLLJo&m@WCDf052uO
zpJlIUmMZsA;T9>NNwAm8G;Xm;UKg%|cLZzKH1Nw**ftjcP5vxMY%Lc2Cn_w$_kd+N
z3RuHKfOY;9u+Dn`@oWX8U^8H=uK{#`l^zxl##m&?PLxA@3EEd475ft8^fC^SlnH=a
zj0N1Z$fFQ2u}3`~0leI7&@K!FJXZ$bNv$;zqEsrtzV7+8nCM8CXfj;+BH-@V0TZ)6
z#+<FQ(f#^xol`<4_)!=Hei0r5zY00vtdI}R3k9G{u>NyNu>NyZu-^tZ1^aD4qYg2c
z9$o`71?xWpg}GFQ3fB3D3rndyCaeJbV6)$8CBl1D#tYVwrV87sgoRz8Uf2uxakvlg
YwRI5iqdNwc3D%mH3#X{G2)1qR0&&#zcK`qY

literal 2977
zcma*pe`r-@9LMo<u5ODY%>q|MwqP=nT+FmT!Ys_3Wl7B}rn7aY%gwv(;@S}BtX7G*
z8I>u5_EQ8GnTo$wmRM$+6=now_(zx^sidVvHcD@w_lM4b%Si6v!fW5>Ip;j*InU=g
zClLfeo_-y7mj?$gwP$+d0{tFNHmB;F=1W2MscBaZFF|3jd185R>0*24J^eRWzbWbF
z6fIj$M|~2(C+hP~raf~`^?dziv^3Wy8|k(4m#EjE;3M_w(*>#1>;AdvrlK<b<FC}$
z8yu{>r#v{I>rsn)jpaZ7ivJr`fn1SpZK*9POXPSfxePK062TQZ^`zE@hN6nrrZ5={
zD@g`RHC2Z-^6(jfTL`J_1B-+n&?M{vb;A3gTG#|07dC=&VI7zxtOgT=m%(_U6O0j-
zgJPir+#s}p5kd<XDx^W4&<HY`+XbLss0QbSO7N@j2skM`2#yI8!BJr>I3kP&-v}eY
z*TM*JP#6k66AHk7Aq325zaCZiq3|czE}R4J3apxNtKg%y2}3w)hj1;}BU}$y7&n8D
z1rLL!aZzOg;G$DNpWwUrN~oZ6NT>o-=7BGShN!b=jJsG$rB_%MHF@T#tfg{5cq@V*
z92eb6g@O6uGSt0PqQ&gHI80@?n!W>DgyUe7@H2Q*I1SbcXTYn%@1RTg3p^(T%22pS
zNPvYx0ca40fw{ufph~y~%oMHzl|oU}bQ?&jG9Jtq?gE_WKF}yU1X_fdV6iX<bO=uZ
z2KEG4CCmovqCOjh8Y(>HrvT60U?rre>=m8{OjKKh7b0{4X7x2d=k<UMW@>$^HtbdI
zdY!vNOb)sG9FRNDf1JCtDt<Ke!vExMs+yd;dxce;Co6X=sFbS73uBb<ES1aTE?<3|
zyFkb#cMovFpLCmE%;c_&3c0%l49p#C*tug_#<|OosZUk80GRDRKvwSl$;uti$mb!g
zgSZxF{yRF#mCIz4XXI@1j675xs5cENaW*G&W>S`OHtFnaGM;u0C)zJY=XoirtO117
z*#yoe+mW-$FtW4Bn7vvUs@G3eHji<_ZZ$cZZwonRlb8(5=2a}+d1`Vt=LpW`V?uT|
zX>vAegq*Y4rp^xF^MWHuHl5Zuo9m+r*>rw+?zIezwPD2B+^0%2O#`#Z)H$2Xs<TOF
zXOqrrIEu~LeSj0qnU~PiBRKWD1n&cEhIKS;6g;rk1>XgGpwSsM#hcF(ReXc&f!?4}
z!gS74CwLQM4!x~a3!cm>VGMmLg;5c11k8LP;3z+)1;P+2Tp|y|50_zFWRWZvE`V1A
zZ`W+#zfob?oB?d|CjfWqrNx9FrNSh93z(KK0du$?FwY+V=6M?+p51^Hya8D1s{uQ}
z$_Ne!eH<CG;}G!@^ec~wUxFN7#Ze^XQNSgp11{>9De#v70~<#ZxE1hli@{FeCcu69
zlYl$*mO_Z~X##%T^R*c7NN3q(IHAGS{gJ@HypJ(v?`-UT!#U6QLLvA;@I`+VN~jzc
zO2G-?4scTN{&Py0Oy#WL{pY;kZ-aiplfXt@Lm$4KJW+*$r*5RMn5NN!cmCT2&-0x^
zCrx~?`D<aC;8)2E!8_6{VFP_q!e+2g*baC}?E&%UA|Ks-RF(<enpOx$sB{TlHva-N
CDDw#b

diff --git a/gpsbabel/reference/ignoreicons.usr b/gpsbabel/reference/ignoreicons.usr
index f3724e4b313be9f9c62eee41c9f958a3d6b9efb4..e7c3484d2386b43fe2a363d468dc61e1f77b5661 100644
GIT binary patch
literal 2901
zcma*peQ1?s9LDkIoN|WYe1SG0)CHO(O)%R(wH26a(lTUfrB2t$mYZiUY@T7$S-xbY
z>s2jDOG+dc$`V^GOEY^}N;o3Q%0EH_!-bk!nTC40z8Bns7{&Qx@Y(NqyPx~Muits%
zQ50RJzvXw9L<g?4q&wyQ`kR_)Ojg&;m!h_w(g8!ppjfoyj*{rg<(Bkz{dcwg?yhf4
za-{v&a85k>MCZJjZb_e2JxhPnQjL{~TF&Y?8P1CNA!YSVsmi?Z@eCiI$&I5Z9$lkH
zO>C;E$t!EBizT8#V-nF)y<WFoFZQ_51*m)s773l8PUrwt!VXX&Yy%GnTS1Ai5lj@;
zfkNR0P#~-Z`NC6Rl&}n3FDwQ*LJDLHb)cV63(}gkYH(4Q3(g4-g5QLx;Dk^LjtWKK
zh;R$|UKk6$7KVdv;W}_Y$OfMY{lTX~1ennaTF%&R;ZLwjI1AnuE`xUjU$s*hz*X-G
zL&1l_Fz}IZ1K1;Y7#x}qDusZD7K1N^d%;&i88{@&4wZS}pejkg$(}LZVkwm_VO2Qv
ze5kwvKG&hm0dD~w+71|)7nh;#p#r=U7-~0__l563yKoF_6Mg}kg&wd$I0ar3eh00>
z1+Yv=gGEA20f;pSS)fM92J?i$pj;RVW(dQ;Od&5E8V3@p6oC0c5#T<PK&>zZq=Xru
zSttj~g$lsH=7P1tY_L(71GWeWz$!lqSa*Y+kfgF#Xar1DbHIv#R=}*T1Dw1G&=e+D
zCo5xJ%3YUpcZfM5cV7T<x7V{IICu4em!?|ykK9exA?NNcVJ(-FJFh;udxpw5!5d?=
z@B|fd*9^$rLeQJLELEJlNXR62_i*_!y{0$w5n((Pa(5Hxn>+S!Hiy`jy}3)1sr{<_
z1(@wW0P}waup*a0Z|<lJ<UXV|4!HB*;VM`DC!4I1v&kBHs4S?P29?{nAu*W*NSQlK
zCfVd<&nn|-;d0XYWVp|Bq4F{yw$3JSHfcxBCd2r5HW{;b3q$q(A)DWFAF_EAv<c4U
z8$!m}Bqn{cIgqXUhz<<`bA%z_ejyjk6h?+a&gR3aWRlJ4T(wvyJAf+$N0MwhiDYvY
z=WG(3U$XfS71q5Hur~~L%K|F<ga*(zn@pXv$*ek?oa}6J@_MeK<M|x0k_vZT0y>3-
z;61^8fC;anvQ=<nc}?(J&;yM%g2znrF_s8^9eSWAAt~I)eX4|Fz#O`*RS2HUav`5X
zO!(-4;ebWS30HZU7N~M96&}$KGz(r_hH;5a^0aUsyePO`)4<PAVcVPpH2LG8cWW`>
zKT=^5z5z_jLBJgD2h8&afO*~th-Vuh1+N3P`g%YIcs9TR;T%VX?4&rvkD!0@sQ5>a
z%gZ@LQl<kQF$M6@;(#K+z-|q=8L+scK!-2_@LoB9H+5?wL|IgTfA0Ch>+MLVX)@gT
z6yWLS0RwX%W6bVsbicve=dh3qeh@~2pM)F1&q6*pE);+hLLul8+<#6B?my=Qe;ZsB
z{B1y^PH-|kyawb7?mr`h$Eb`I-1#R6E2-QjtO0zm`8%ytc$LaD!5wLqu!Txe*bW+m
eU4W0n-GHC1eSi<;F0e{)Yg#QFrqU{S+x!E`H|IY9

literal 2901
zcma*pe`u9e9LMqJx#kv0{wQ!pWDAs$q+zLlgc+DQ$&#9BtfuoWmz#G#aBYZlR;xtZ
zipms0?S~?`$W;6_GsUvn)G#9`V}FDRl1f@yWTW)<d4J$sxQyifF?j8J&htFyIp=)N
zeG*X=_0wPLL&edNYc1(cIbVNIBpXuIbql1Z<J|O{h7_SV+B&H?x^}fC{gM8=L4Q;0
z8&b4vJ0JQaqR-T4W4a}MN%cJa&1`I_OxDtC_phN>?1z-pH#Jrkj!oqF_*`xrMTzJ}
zJ!*1OO-*4*Q(c^l1{EcvWqQ36dcF8Xp&L*+1QrXOpibBWs)Ub0xv&L1Eo=tG!a6Wn
zSPdo$Z-Vhc8yGFD03(D}aJ$e9h6;^fpimF`3$-AvSz8Etg>rCNC<VU>PlB_;W8jo9
z3G@i}fs?{0@U1W$d?O46M}&dk3n3pI7Gl7R_G&rfPlUg~PT>;xP++Cw?Sik`Aq?QE
zUBazkzi=D)RJaQq5IhW;#)Zm6z(c2kZozNywNOIkxKIYD%m+t>n$X!Z##=0-(j_bp
zO`drwYpHxGydU6&<DuKBFfcDJLp?|ZbOVNZ0_+vO2it_xV2khzcuzPF)(RKE+rl59
zUHBWkEJWJ(@nRtX776*FMi>O169$7a;TAAU7zRp(!q9XtNUAa(ED#<9+~*NcD?APw
zg;`*UFbA{>^8f>z3swowf_0(KCZU1~tNc7*-3@j^ipoLZ1;9i#2fP~44w%(<0G-zZ
z4uxsesmi!Zx$AQ7jx#yr?khm<JpY;8)vMyAsTTexchl75+&wI;;yziqTS;Y%n!GVa
z3NKN)PVVy5$GMAyTypm)H~d+z>CN0DjHN>E?go8x#~ya>*p^NZyD?3sJ{PV4X8TW&
zmAikla>p9^KBToD&*IMigsWV+PBvL1XOlJZP+3qP8dNgboWh++S<cy{v$M%~TDY8O
zzZUNEMyRX-gw)vt&L+o^v&k^Bv&opfTNtYMPgXWhal;NZIh!8{IcJlY^v&kYY~A^4
zayI7(&gN_(JDW5)n-xON*=$y42k;faktCZ=YbKlPLxpTQzpQ&D17mL(nQR_XrGcit
z*<|XRO=i{Eq_eY0=QUi#iRV7RiRR8rY3dZ5`aOcr0S?0|nl=j_*apFG!5L_@g{I8m
zvs4woAZMTtsFW~+`&0=&#F#@LYvqC`vrHIGpHg9Dz#V{@F92NSWm+f<pu!{igUsSG
zjH_&t6~Yzpmf+)>1N?U?Y?}*!L;eilO}(|4@E$5m!gqjaIR==+!+?3-2bkv_fOvKQ
zQt&QdtFH!}0Ivr)AoOu$$c{tAkD!0@sQ5>a%geZmq&x+9#0<bg{bLIJCBVSO(FE=R
zEba)fTeuVOUj8KDO?{*gqCA>_fA0Ch%bZ9TIb^t@!PEVbz`%TtF=n4^oPI;N&ksTY
z_)+jfe-etQoEFA_Gr|OLR`B_APMAXFqTuuAvfyunUcr;VL0v%~zMVW#1%jt;xUht#
zQG!qY`vuSQ140{3e6aazVY=X-l9_@}q-TUp^hpU@!6IQN;74jd$b2sHq1;Vnx!|K|
MrEro;yWnl}AAo1&&;S4c

diff --git a/gpsbabel/reference/lowrance.usr b/gpsbabel/reference/lowrance.usr
index 26350d0292457fd874791cdd7e32be69f2700ee3..3de22550921947b97bb78018207cdab491072926 100644
GIT binary patch
delta 46
zcmaFI@{Wa<iGhKE6NvwZJ2F^r<PBnEOr4y-Xv-)#c^;!PW7gzHj4q4{lhv8r0Rh1a
AM*si-

delta 46
zcmaFI@{Wa<iGhKE6NvwZJ2Kd8<PBnEOq-m*Xv-)xc^;!PWA@}nj4q6dlhv8r0Rk2a
AOaK4?

diff --git a/gpsbabel/testo.d/classic-1.test b/gpsbabel/testo.d/classic-1.test
index db446cc4e..aaaaac8d8 100644
--- a/gpsbabel/testo.d/classic-1.test
+++ b/gpsbabel/testo.d/classic-1.test
@@ -4,41 +4,6 @@
 # Magellan serial
 # TODO
 
-
-#
-# Lowrance USR.  Binary, and also slightly lossy because of the math to
-# convert lat/long.  It also doesn't support description, which makes it
-# awkward  to test.
-#
-rm -f ${TMPDIR}/lowrance1.usr
-rm -f ${TMPDIR}/enchilada1.usr
-rm -f ${TMPDIR}/enchilada.gpx
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o lowranceusr -F ${TMPDIR}/lowrance1.usr
-bincompare ${TMPDIR}/lowrance1.usr ${REFERENCE}/lowrance.usr
-gpsbabel -i lowranceusr -f ${TMPDIR}/lowrance1.usr -o lowranceusr -F ${TMPDIR}/lowrance1.usr
-# And because of the FP rounding, we can't even read our file, write it back
-# and get the same data.  Sigh. 
-# bincompare ${REFERENCE}/lowrance.usr  ${TMPDIR}/lowrance1.usr
-gpsbabel -i lowranceusr -f ${REFERENCE}/all.usr -o gpx -F ${TMPDIR}/enchilada.gpx
-gpsbabel -i gpx -f ${TMPDIR}/enchilada.gpx -o lowranceusr -F ${TMPDIR}/enchilada1.usr
-bincompare ${TMPDIR}/enchilada1.usr ${REFERENCE}/enchilada.usr
-# Don't convert icons as waypts
-gpsbabel -i lowranceusr,ignoreicons -f ${REFERENCE}/all.usr -o gpx -F ${TMPDIR}/enchilada.gpx
-gpsbabel -i gpx -f ${TMPDIR}/enchilada.gpx -o lowranceusr -F ${TMPDIR}/enchilada1.usr
-bincompare ${TMPDIR}/enchilada1.usr ${REFERENCE}/ignoreicons.usr
-
-#
-# Another variation of Lowrance.  Compare v2 and v3.  These original
-# files were saved on the same units as v2 and v3.
-#
-${PNAME} -i lowranceusr -f ${REFERENCE}/lowrance-v2.usr -o unicsv,utc=0 -F ${TMPDIR}/lowrance-v2-unicsv.txt
-${PNAME} -i lowranceusr -f ${REFERENCE}/lowrance-v3.usr -o unicsv,utc=0 -F ${TMPDIR}/lowrance-v3-unicsv.txt
-compare ${REFERENCE}/lowrance-v2-unicsv.txt ${TMPDIR}/lowrance-v2-unicsv.txt
-compare ${REFERENCE}/lowrance-v3-unicsv.txt ${TMPDIR}/lowrance-v3-unicsv.txt
-# Ideally, there'd be a test for v2 vs. v3 writes, but their numeric
-# instability makes this icky.
-
-#
 # CSV (Comma separated value) data.
 
 gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o csv -F ${TMPDIR}/csv.csv
diff --git a/gpsbabel/testo.d/lowranceusr.test b/gpsbabel/testo.d/lowranceusr.test
new file mode 100644
index 000000000..a45b1bca9
--- /dev/null
+++ b/gpsbabel/testo.d/lowranceusr.test
@@ -0,0 +1,36 @@
+
+#
+# Lowrance USR.  Binary, and also slightly lossy because of the math to
+# convert lat/long.  It also doesn't support description, which makes it
+# awkward  to test.
+#
+rm -f ${TMPDIR}/lowrance1.usr
+rm -f ${TMPDIR}/enchilada1.usr
+rm -f ${TMPDIR}/enchilada.gpx
+gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o lowranceusr -F ${TMPDIR}/lowrance1.usr
+bincompare ${TMPDIR}/lowrance1.usr ${REFERENCE}/lowrance.usr
+
+gpsbabel -i lowranceusr -f ${TMPDIR}/lowrance1.usr -o lowranceusr -F ${TMPDIR}/lowrance1.usr
+# And because of the FP rounding, we can't even read our file, write it back
+# and get the same data.  Sigh. 
+# bincompare ${REFERENCE}/lowrance.usr  ${TMPDIR}/lowrance1.usr
+
+gpsbabel -i lowranceusr -f ${REFERENCE}/all.usr -o gpx -F ${TMPDIR}/enchilada.gpx
+gpsbabel -i gpx -f ${TMPDIR}/enchilada.gpx -o lowranceusr -F ${TMPDIR}/enchilada1.usr
+bincompare ${TMPDIR}/enchilada1.usr ${REFERENCE}/enchilada.usr
+
+# Don't convert icons as waypts
+gpsbabel -i lowranceusr,ignoreicons -f ${REFERENCE}/all.usr -o gpx -F ${TMPDIR}/enchilada.gpx
+gpsbabel -i gpx -f ${TMPDIR}/enchilada.gpx -o lowranceusr -F ${TMPDIR}/enchilada1.usr
+bincompare ${TMPDIR}/enchilada1.usr ${REFERENCE}/ignoreicons.usr
+#
+# Another variation of Lowrance.  Compare v2 and v3.  These original
+# files were saved on the same units as v2 and v3.
+#
+${PNAME} -i lowranceusr -f ${REFERENCE}/lowrance-v2.usr -o unicsv,utc=0 -F ${TMPDIR}/lowrance-v2-unicsv.txt
+${PNAME} -i lowranceusr -f ${REFERENCE}/lowrance-v3.usr -o unicsv,utc=0 -F ${TMPDIR}/lowrance-v3-unicsv.txt
+compare ${REFERENCE}/lowrance-v2-unicsv.txt ${TMPDIR}/lowrance-v2-unicsv.txt
+compare ${REFERENCE}/lowrance-v3-unicsv.txt ${TMPDIR}/lowrance-v3-unicsv.txt
+# Ideally, there'd be a test for v2 vs. v3 writes, but their numeric
+# instability makes this icky.
+
-- 
2.30.2